From: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Date: Wed, 19 Aug 2020 17:40:32 +0000 (+0100)
Subject: clarify warning message about PIC/PIE
X-Git-Tag: archive/raspbian/5.14.2+dfsg-6+rpi1^2~13
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=2f66cf87bad79cae2cd6b2fceb4e9c431bf9d2e3;p=qtbase-opensource-src.git

clarify warning message about PIC/PIE

Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=e2265965083343aa
Last-Update: 2020-07-08


Gbp-Pq: Name clarify_pic_message.diff
---

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index fe8e8e8bc..7d20af846 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1280,7 +1280,7 @@ Q_CORE_EXPORT int qrand();
 #if !defined(QT_BOOTSTRAPPED) && defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && \
     (!defined(__PIC__) || (defined(__PIE__) && defined(Q_CC_GNU) && Q_CC_GNU >= 500))
 #  error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\
-         "Compile your code with -fPIC (-fPIE is not enough)."
+         "Compile your code with -fPIC (and not with -fPIE)."
 #endif
 
 namespace QtPrivate {